Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 20 Jun 2010 11:23:04 +0000 (11:23 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 20 Jun 2010 11:23:04 +0000 (11:23 +0000)
commit51a7d2e0f87c164361a1701620b0f446df261745
treecdc628e3f891123ec3be6e7d7513e1a9436dc707
parent627721499a59f21d83e71506dbb4f247c931962b
parent54df222e023eed0425ea8b2dd5f25ac5309bb4d1
Merge from mainline.